From: Florian Müllner <fmuellner@gnome.org>
Date: Tue, 10 Jun 2025 11:57:46 +0000 (+0200)
Subject: ci: Don't duplicate report filenames
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~124^2^2~51
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=12e234031e018c43bb7ee6ec7eda53a42af30e16;p=gnome-shell.git

ci: Don't duplicate report filenames

Define report filenames as variables if they are referenced more than
once to make sneaky typos less likely.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3745>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 621ecee7b..f8f29803a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,10 +82,11 @@ check-commit-log:
   stage: pre-review
   variables:
     GIT_DEPTH: "100"
+    JUNIT_REPORT: commit-message-junit-report.xml
   script:
     - if [[ x"$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "x" ]] ;
       then
-        ci-fairy check-commits --junit-xml=commit-message-junit-report.xml ;
+        ci-fairy check-commits --junit-xml=$JUNIT_REPORT ;
       else
         echo "Not a merge request" ;
       fi
@@ -94,16 +95,18 @@ check-commit-log:
   artifacts:
     expire_in: 1 week
     reports:
-      junit: commit-message-junit-report.xml
+      junit: $JUNIT_REPORT
 
 check-merge-request:
   extends:
     - .fdo.ci-fairy
   stage: pre-review
+  variables:
+    JUNIT_REPORT: check-merge-request-report.xml
   script:
     - if [[ x"$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "x" ]] ;
       then
-        ci-fairy check-merge-request --require-allow-collaboration --junit-xml=check-merge-request-report.xml ;
+        ci-fairy check-merge-request --require-allow-collaboration --junit-xml=$JUNIT_REPORT ;
       else
         echo "Not a merge request" ;
       fi
@@ -112,7 +115,7 @@ check-merge-request:
   artifacts:
     expire_in: 1 week
     reports:
-      junit: check-merge-request-report.xml
+      junit: $JUNIT_REPORT
 
 build-fedora-container:
   extends: